ui/app/workspace/custom-pricing/overrides/scopedPricingOverridesView.tsx (1)

194-206: Deduplicate PricingOverrideDrawer rendering to avoid prop drift across branches.

The same drawer config now exists in both the empty-state early return and the main layout path.

♻️ Suggested consolidation

+	const drawer = (
+		<PricingOverrideDrawer
+			open={isDrawerOpen}
+			onOpenChange={setIsDrawerOpen}
+			editingOverride={editingOverride}
+			scopeLock={createScopeLock}
+		/>
+	);

 	if (!isLoading && !error && rows.length === 0) {
 		return (
 			<>
 				<PricingOverridesEmptyState onCreateClick={openCreateDrawer} />
-				<PricingOverrideDrawer
-					open={isDrawerOpen}
-					onOpenChange={setIsDrawerOpen}
-					editingOverride={editingOverride}
-					scopeLock={createScopeLock}
-				/>
+				{drawer}
 			</>
 		);
 	}

 	return (
 		<div className="mt-6 space-y-4">
 			...
-			<PricingOverrideDrawer
-				open={isDrawerOpen}
-				onOpenChange={setIsDrawerOpen}
-				editingOverride={editingOverride}
-				scopeLock={createScopeLock}
-			/>
+			{drawer}
 			...
 		</div>
 	);

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@ui/app/workspace/custom-pricing/overrides/scopedPricingOverridesView.tsx`
around lines 194 - 206, The PricingOverrideDrawer is duplicated in the
empty-state early return and the main render, which can cause prop drift;
refactor so the drawer is rendered once outside the conditional branch: keep the
existing empty-state return that renders PricingOverridesEmptyState (using
openCreateDrawer) but remove the inline PricingOverrideDrawer there and instead
add a single PricingOverrideDrawer in the common render path (using
isDrawerOpen, setIsDrawerOpen, editingOverride, createScopeLock) so the drawer
props are managed in one place and not duplicated across the
isLoading/error/rows.length branches.

transports/config.schema.json (1)

3105-3111: Consider referencing the enum definition for request_types items.

The request_types array items are defined as plain "type": "string" rather than referencing the pricing_override_request_type enum defined at lines 3128-3143. This means the schema won't validate that values are from the allowed set.

🔧 Suggested fix

         "request_types": {
           "type": "array",
           "description": "Request types this override applies to (empty = all types)",
           "items": {
-            "type": "string"
+            "$ref": "#/$defs/pricing_override_request_type"
           }
         },

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@transports/config.schema.json` around lines 3105 - 3111, The request_types
array currently uses a generic string item type and should instead validate
against the existing enum; update the request_types schema (the "request_types"
property) so its "items" uses a $ref to the pricing_override_request_type enum
definition (referencing the pricing_override_request_type schema name) rather
than "type": "string", ensuring values are validated against the allowed set.

framework/modelcatalog/overrides_test.go (1)

36-54: Consider using bifrost.Ptr() for pointer creation.

The test creates pointers using the address operator (&providerID). Based on learnings, the repository prefers using bifrost.Ptr() for consistency across all code paths, including test utilities.

♻️ Suggested refactor

-	providerID := "openai"
-	require.NoError(t, mc.SetPricingOverrides([]configstoreTables.TablePricingOverride{
+	require.NoError(t, mc.SetPricingOverrides([]configstoreTables.TablePricingOverride{
 		{
 			ID:               "openai-override-0",
 			ScopeKind:        string(ScopeKindProvider),
-			ProviderID:       &providerID,
+			ProviderID:       bifrost.Ptr("openai"),
 			MatchType:        string(MatchTypeWildcard),
 			Pattern:          "gpt-*",
 			PricingPatchJSON: `{"input_cost_per_token":10}`,
 		},
 		{
 			ID:               "openai-override-1",
 			ScopeKind:        string(ScopeKindProvider),
-			ProviderID:       &providerID,
+			ProviderID:       bifrost.Ptr("openai"),
 			MatchType:        string(MatchTypeExact),
 			Pattern:          "gpt-4o",
 			PricingPatchJSON: `{"input_cost_per_token":20}`,
 		},
 	}))

This pattern should be applied consistently throughout the test file. Based on learnings: "prefer using bifrost.Ptr() to create pointers instead of the address operator (&) even when & would be valid syntactically."

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@framework/modelcatalog/overrides_test.go` around lines 36 - 54, Replace uses
of the address operator for providerID in the test's TablePricingOverride
entries with bifrost.Ptr(...) for consistency: in the block where providerID is
defined and passed into mc.SetPricingOverrides (the TablePricingOverride structs
used with SetPricingOverrides), change all instances of &providerID to
bifrost.Ptr(providerID); apply the same replacement consistently across this
test file wherever plain &-style pointer creation is used.

ui/app/workspace/custom-pricing/overrides/pricingFieldSelector.tsx (1)

36-47: Consider optimizing the auto-activation effect.

The useEffect creates a new Set on every invocation even when no fields need to be added. Consider checking if any additions are needed before creating the new Set:

♻️ Suggested optimization

 	useEffect(() => {
 		setActiveFields((prev) => {
+			let needsUpdate = false;
+			for (const f of PRICING_FIELDS) {
+				if (values[f.key] != null && values[f.key]!.trim() !== "" && !prev.has(f.key)) {
+					needsUpdate = true;
+					break;
+				}
+			}
+			if (!needsUpdate) return prev;
+
 			const next = new Set(prev);
 			for (const f of PRICING_FIELDS) {
 				if (values[f.key] != null && values[f.key]!.trim() !== "") {
 					next.add(f.key);
 				}
 			}
 			return next;
 		});
 	}, [values]);

This avoids creating a new Set reference when no fields need activation, preventing unnecessary re-renders of child components.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@ui/app/workspace/custom-pricing/overrides/pricingFieldSelector.tsx` around
lines 36 - 47, The useEffect auto-activation currently always constructs a new
Set and calls setActiveFields causing unnecessary re-renders; modify the effect
that references useEffect, PRICING_FIELDS, values and setActiveFields to first
scan PRICING_FIELDS for any keys where values[key] is non-empty and not already
present in the current prev set, and only when at least one such key exists
create a new Set based on prev, add the missing keys and call
setActiveFields(next); otherwise do nothing (avoid creating the Set or calling
setActiveFields).

framework/modelcatalog/main.go (1)

258-261: Consider failing initialization if pricing overrides fail to load.

Currently, a failure to load pricing overrides only logs a warning but allows initialization to continue. If pricing overrides are critical to correct billing behavior, this might lead to silent billing inaccuracies.

Depending on business requirements, consider whether this should be a fatal error:

 	if err := mc.loadPricingOverridesFromStore(ctx); err != nil {
-		logger.Warn("failed to load pricing overrides: %v", err)
+		return nil, fmt.Errorf("failed to load pricing overrides: %w", err)
 	}

Or at minimum, ensure there's monitoring/alerting for this warning path.

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@framework/modelcatalog/main.go` around lines 258 - 261, The pricing overrides
load is currently treated as a warning; change initialization to fail fast by
returning the error from the initializer instead of calling logger.Warn when
mc.loadPricingOverridesFromStore(ctx) returns non-nil. Locate the call to
mc.loadPricingOverridesFromStore in the initializer (the block using
logger.Warn) and replace the warn-only behavior with a wrapped error return (or
propagate the original error) so the caller cannot continue with a possibly
incorrect billing state; optionally log the error just before returning for
context.

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes